Make the toolbar-style and toolbar-size settings work

This broke when moving the setting from gtktoolbar.c to gtksettings.c.
Spotted by Christian Persch in bug 603271.

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 9e36e833337136fbb6abb31ab4a1be2463f93fe5..9c744daef700d04aebbdb3b0c3d03f4a18048571 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -982,7 +982,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                    GTK_TYPE_TOOLBAR_STYLE,
                                                                    GTK_TOOLBAR_BOTH,
                                                                    GTK_PARAM_READWRITE),
-                                             NULL);
+                                             gtk_rc_property_parse_enum);
   g_assert (result == PROP_TOOLBAR_STYLE);
 
   /**
@@ -997,7 +997,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                    GTK_TYPE_ICON_SIZE,
                                                                    GTK_ICON_SIZE_LARGE_TOOLBAR,
                                                                    GTK_PARAM_READWRITE),
-                                             NULL);
+                                             gtk_rc_property_parse_enum);
   g_assert (result == PROP_TOOLBAR_ICON_SIZE);
 }